fixed merging
authorAnja Bruls <anja@transceptor.technology>
Wed, 5 Dec 2018 15:28:09 +0000 (16:28 +0100)
committerAnja Bruls <anja@transceptor.technology>
Wed, 5 Dec 2018 15:28:09 +0000 (16:28 +0100)
111 files changed:
dbtest/.accounts.dat [deleted file]
dbtest/dbpath0/.accounts.dat [deleted file]
dbtest/dbpath0/anja/.dropped [deleted file]
dbtest/dbpath0/anja/.max_series_id [deleted file]
dbtest/dbpath0/anja/buffer.dat [deleted file]
dbtest/dbpath0/anja/database.conf [deleted file]
dbtest/dbpath0/anja/database.dat [deleted file]
dbtest/dbpath0/anja/groups.dat [deleted file]
dbtest/dbpath0/anja/series.dat [deleted file]
dbtest/dbpath0/anja/servers.dat [deleted file]
dbtest/dbpath0/anja/users.dat [deleted file]
dbtest/dbpath0/benchmark/.dropped [deleted file]
dbtest/dbpath0/benchmark/.max_series_id [deleted file]
dbtest/dbpath0/benchmark/buffer.dat [deleted file]
dbtest/dbpath0/benchmark/database.conf [deleted file]
dbtest/dbpath0/benchmark/database.dat [deleted file]
dbtest/dbpath0/benchmark/groups.dat [deleted file]
dbtest/dbpath0/benchmark/series.dat [deleted file]
dbtest/dbpath0/benchmark/servers.dat [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000000.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000000.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000001.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000001.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000002.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000002.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000003.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000003.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000004.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000004.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000005.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000005.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000006.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000006.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000007.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000007.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000008.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000008.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000009.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000009.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000010.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000010.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000011.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000011.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000012.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000012.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000013.idx [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000013.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000014.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000015.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000016.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000017.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000018.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000019.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000020.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000021.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000022.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000023.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000024.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000025.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000026.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000027.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000028.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000029.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000030.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/1451520000000000031.sdb [deleted file]
dbtest/dbpath0/benchmark/shards/__1451520000000000014.sdb [deleted file]
dbtest/dbpath0/benchmark/users.dat [deleted file]
dbtest/dbpath1/.accounts.dat [deleted file]
dbtest/dbpath1/benchmark/.dropped [deleted file]
dbtest/dbpath1/benchmark/buffer.dat [deleted file]
dbtest/dbpath1/benchmark/database.conf [deleted file]
dbtest/dbpath1/benchmark/database.dat [deleted file]
dbtest/dbpath1/benchmark/groups.dat [deleted file]
dbtest/dbpath1/benchmark/series.dat [deleted file]
dbtest/dbpath1/benchmark/servers.dat [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000000.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000001.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000002.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000003.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000004.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000005.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000006.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000007.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000008.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000009.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000010.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000011.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000012.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000013.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000014.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000015.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000016.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000017.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000018.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000019.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000020.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000021.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000022.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000023.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000024.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000025.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000026.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000027.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000028.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000029.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000030.sdb [deleted file]
dbtest/dbpath1/benchmark/shards/1451520000000000031.sdb [deleted file]
dbtest/dbpath1/benchmark/users.dat [deleted file]
dbtest/siridb-http.conf [deleted file]
dbtest/siridb0.conf [deleted file]
dbtest/siridb1.conf [deleted file]

diff --git a/dbtest/.accounts.dat b/dbtest/.accounts.dat
deleted file mode 100644 (file)
index dcb4dd4..0000000
+++ /dev/null
@@ -1 +0,0 @@
\ 1ï\82sa¿EI5djmJS$1DhOYRlSPpQ7LKlNlnT.npvRhg8uQPlWkoQRNhKPXnNknMtrRuKUTR
\ No newline at end of file
diff --git a/dbtest/dbpath0/.accounts.dat b/dbtest/dbpath0/.accounts.dat
deleted file mode 100644 (file)
index 2eb141d..0000000
+++ /dev/null
@@ -1 +0,0 @@
\ 1ï\82sa¿4xt4e1rb$1HuVsdC7ZpFcCbsI1.Vmo7hBGsbsYFFbmV/7dcHKvQJlHzw1VQ8uoG
\ No newline at end of file
diff --git a/dbtest/dbpath0/anja/.dropped b/dbtest/dbpath0/anja/.dropped
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/dbtest/dbpath0/anja/.max_series_id b/dbtest/dbpath0/anja/.max_series_id
deleted file mode 100644 (file)
index d540dfd..0000000
Binary files a/dbtest/dbpath0/anja/.max_series_id and /dev/null differ
diff --git a/dbtest/dbpath0/anja/buffer.dat b/dbtest/dbpath0/anja/buffer.dat
deleted file mode 100644 (file)
index 0ab1802..0000000
Binary files a/dbtest/dbpath0/anja/buffer.dat and /dev/null differ
diff --git a/dbtest/dbpath0/anja/database.conf b/dbtest/dbpath0/anja/database.conf
deleted file mode 100644 (file)
index b56a91b..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Welcome to the SiriDB configuration file
-#
-
-[buffer]
-# Alternative path to save the buffer file.
-# In case you later plan to change this location you manually need to move
-# the buffer file to the new location.
-# path = <buffer_path>
-
-# Buffer size in bytes. This size must be a multiple of 512 with a maximum
-# of 1048576 bytes. Be careful using large values since SiriDB will require
-# memory based on this value. A value between 1024 and 32768 is recommended.
-# size = 1024
-
-size = 1024
diff --git a/dbtest/dbpath0/anja/database.dat b/dbtest/dbpath0/anja/database.dat
deleted file mode 100644 (file)
index 27f24b4..0000000
Binary files a/dbtest/dbpath0/anja/database.dat and /dev/null differ
diff --git a/dbtest/dbpath0/anja/groups.dat b/dbtest/dbpath0/anja/groups.dat
deleted file mode 100644 (file)
index 3c82d7a..0000000
+++ /dev/null
@@ -1 +0,0 @@
\ 1
\ No newline at end of file
diff --git a/dbtest/dbpath0/anja/series.dat b/dbtest/dbpath0/anja/series.dat
deleted file mode 100644 (file)
index 22057fe..0000000
Binary files a/dbtest/dbpath0/anja/series.dat and /dev/null differ
diff --git a/dbtest/dbpath0/anja/servers.dat b/dbtest/dbpath0/anja/servers.dat
deleted file mode 100644 (file)
index 05c9a45..0000000
Binary files a/dbtest/dbpath0/anja/servers.dat and /dev/null differ
diff --git a/dbtest/dbpath0/anja/users.dat b/dbtest/dbpath0/anja/users.dat
deleted file mode 100644 (file)
index 4ce0f39..0000000
+++ /dev/null
@@ -1 +0,0 @@
\ 1ð\84iris¿/ITTEIBl$1Q7urI1k4h4PCfGgCI5ifj7Iyc8wqJVdAU5h/TSinJUe5ObdeH5V0Méÿ\ 3
\ No newline at end of file
diff --git a/dbtest/dbpath0/benchmark/.dropped b/dbtest/dbpath0/benchmark/.dropped
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/dbtest/dbpath0/benchmark/.max_series_id b/dbtest/dbpath0/benchmark/.max_series_id
deleted file mode 100644 (file)
index 01387f5..0000000
Binary files a/dbtest/dbpath0/benchmark/.max_series_id and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/buffer.dat b/dbtest/dbpath0/benchmark/buffer.dat
deleted file mode 100644 (file)
index 23db84e..0000000
Binary files a/dbtest/dbpath0/benchmark/buffer.dat and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/database.conf b/dbtest/dbpath0/benchmark/database.conf
deleted file mode 100644 (file)
index b56a91b..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Welcome to the SiriDB configuration file
-#
-
-[buffer]
-# Alternative path to save the buffer file.
-# In case you later plan to change this location you manually need to move
-# the buffer file to the new location.
-# path = <buffer_path>
-
-# Buffer size in bytes. This size must be a multiple of 512 with a maximum
-# of 1048576 bytes. Be careful using large values since SiriDB will require
-# memory based on this value. A value between 1024 and 32768 is recommended.
-# size = 1024
-
-size = 1024
diff --git a/dbtest/dbpath0/benchmark/database.dat b/dbtest/dbpath0/benchmark/database.dat
deleted file mode 100644 (file)
index 69d8581..0000000
Binary files a/dbtest/dbpath0/benchmark/database.dat and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/groups.dat b/dbtest/dbpath0/benchmark/groups.dat
deleted file mode 100644 (file)
index 3c82d7a..0000000
+++ /dev/null
@@ -1 +0,0 @@
\ 1
\ No newline at end of file
diff --git a/dbtest/dbpath0/benchmark/series.dat b/dbtest/dbpath0/benchmark/series.dat
deleted file mode 100644 (file)
index 6d1def4..0000000
Binary files a/dbtest/dbpath0/benchmark/series.dat and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/servers.dat b/dbtest/dbpath0/benchmark/servers.dat
deleted file mode 100644 (file)
index e81f0aa..0000000
Binary files a/dbtest/dbpath0/benchmark/servers.dat and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000000.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000000.idx
deleted file mode 100644 (file)
index 3dc3071..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000000.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000000.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000000.sdb
deleted file mode 100644 (file)
index 414401a..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000000.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000001.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000001.idx
deleted file mode 100644 (file)
index 0c2f75e..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000001.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000001.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000001.sdb
deleted file mode 100644 (file)
index 9985471..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000001.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000002.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000002.idx
deleted file mode 100644 (file)
index 9ae6160..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000002.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000002.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000002.sdb
deleted file mode 100644 (file)
index b671694..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000002.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000003.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000003.idx
deleted file mode 100644 (file)
index ef59043..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000003.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000003.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000003.sdb
deleted file mode 100644 (file)
index f6bce1c..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000003.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000004.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000004.idx
deleted file mode 100644 (file)
index 6884094..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000004.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000004.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000004.sdb
deleted file mode 100644 (file)
index 843b7ea..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000004.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000005.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000005.idx
deleted file mode 100644 (file)
index 5f36889..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000005.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000005.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000005.sdb
deleted file mode 100644 (file)
index bb1cd00..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000005.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000006.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000006.idx
deleted file mode 100644 (file)
index a4af065..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000006.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000006.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000006.sdb
deleted file mode 100644 (file)
index c41c590..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000006.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000007.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000007.idx
deleted file mode 100644 (file)
index 6f92932..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000007.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000007.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000007.sdb
deleted file mode 100644 (file)
index 163f5d9..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000007.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000008.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000008.idx
deleted file mode 100644 (file)
index 4564c67..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000008.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000008.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000008.sdb
deleted file mode 100644 (file)
index f0920f9..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000008.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000009.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000009.idx
deleted file mode 100644 (file)
index 46c7334..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000009.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000009.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000009.sdb
deleted file mode 100644 (file)
index ff6a2df..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000009.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000010.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000010.idx
deleted file mode 100644 (file)
index ded7b9c..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000010.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000010.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000010.sdb
deleted file mode 100644 (file)
index 43dd682..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000010.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000011.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000011.idx
deleted file mode 100644 (file)
index 91d2364..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000011.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000011.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000011.sdb
deleted file mode 100644 (file)
index 0f10199..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000011.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000012.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000012.idx
deleted file mode 100644 (file)
index 9b30115..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000012.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000012.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000012.sdb
deleted file mode 100644 (file)
index 7869995..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000012.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000013.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000013.idx
deleted file mode 100644 (file)
index cde04a7..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000013.idx and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000013.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000013.sdb
deleted file mode 100644 (file)
index c9c1dcb..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000013.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000014.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000014.sdb
deleted file mode 100644 (file)
index 0ee2c0d..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000014.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000015.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000015.sdb
deleted file mode 100644 (file)
index b7e1243..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000015.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000016.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000016.sdb
deleted file mode 100644 (file)
index 351ca75..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000016.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000017.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000017.sdb
deleted file mode 100644 (file)
index 09f22c5..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000017.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000018.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000018.sdb
deleted file mode 100644 (file)
index 7249717..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000018.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000019.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000019.sdb
deleted file mode 100644 (file)
index 49bc9d2..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000019.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000020.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000020.sdb
deleted file mode 100644 (file)
index 8123b4d..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000020.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000021.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000021.sdb
deleted file mode 100644 (file)
index bc55f15..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000021.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000022.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000022.sdb
deleted file mode 100644 (file)
index 27dda82..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000022.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000023.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000023.sdb
deleted file mode 100644 (file)
index f1563da..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000023.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000024.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000024.sdb
deleted file mode 100644 (file)
index 34a2869..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000024.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000025.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000025.sdb
deleted file mode 100644 (file)
index 6d8a6ff..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000025.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000026.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000026.sdb
deleted file mode 100644 (file)
index bc543fd..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000026.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000027.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000027.sdb
deleted file mode 100644 (file)
index b2275b7..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000027.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000028.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000028.sdb
deleted file mode 100644 (file)
index f2b4a55..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000028.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000029.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000029.sdb
deleted file mode 100644 (file)
index b65c217..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000029.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000030.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000030.sdb
deleted file mode 100644 (file)
index 430cc4b..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000030.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000031.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000031.sdb
deleted file mode 100644 (file)
index 0364bd0..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000031.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/shards/__1451520000000000014.sdb b/dbtest/dbpath0/benchmark/shards/__1451520000000000014.sdb
deleted file mode 100644 (file)
index 01dd929..0000000
Binary files a/dbtest/dbpath0/benchmark/shards/__1451520000000000014.sdb and /dev/null differ
diff --git a/dbtest/dbpath0/benchmark/users.dat b/dbtest/dbpath0/benchmark/users.dat
deleted file mode 100644 (file)
index 04d03e1..0000000
+++ /dev/null
@@ -1 +0,0 @@
\ 1ð\84iris¿gre84FaJ$1iMGwWNldUGnKIJjNj7bLkNHIW6PwOJiDOITEk4XLnIE9gLeBZIuFKéÿ\ 3
\ No newline at end of file
diff --git a/dbtest/dbpath1/.accounts.dat b/dbtest/dbpath1/.accounts.dat
deleted file mode 100644 (file)
index 3c4e443..0000000
+++ /dev/null
@@ -1 +0,0 @@
\ 1ï\82sa¿vZEWv13W$172ZCeYcCY4qc9yWq4Rn.V4DecWWXIU55S/c93sBDcPzyZZ8b6teaR
\ No newline at end of file
diff --git a/dbtest/dbpath1/benchmark/.dropped b/dbtest/dbpath1/benchmark/.dropped
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/dbtest/dbpath1/benchmark/buffer.dat b/dbtest/dbpath1/benchmark/buffer.dat
deleted file mode 100644 (file)
index f28c469..0000000
Binary files a/dbtest/dbpath1/benchmark/buffer.dat and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/database.conf b/dbtest/dbpath1/benchmark/database.conf
deleted file mode 100644 (file)
index b56a91b..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Welcome to the SiriDB configuration file
-#
-
-[buffer]
-# Alternative path to save the buffer file.
-# In case you later plan to change this location you manually need to move
-# the buffer file to the new location.
-# path = <buffer_path>
-
-# Buffer size in bytes. This size must be a multiple of 512 with a maximum
-# of 1048576 bytes. Be careful using large values since SiriDB will require
-# memory based on this value. A value between 1024 and 32768 is recommended.
-# size = 1024
-
-size = 1024
diff --git a/dbtest/dbpath1/benchmark/database.dat b/dbtest/dbpath1/benchmark/database.dat
deleted file mode 100644 (file)
index 75b2fcc..0000000
Binary files a/dbtest/dbpath1/benchmark/database.dat and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/groups.dat b/dbtest/dbpath1/benchmark/groups.dat
deleted file mode 100644 (file)
index 3c82d7a..0000000
+++ /dev/null
@@ -1 +0,0 @@
\ 1
\ No newline at end of file
diff --git a/dbtest/dbpath1/benchmark/series.dat b/dbtest/dbpath1/benchmark/series.dat
deleted file mode 100644 (file)
index b1e51fa..0000000
Binary files a/dbtest/dbpath1/benchmark/series.dat and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/servers.dat b/dbtest/dbpath1/benchmark/servers.dat
deleted file mode 100644 (file)
index d6fb046..0000000
Binary files a/dbtest/dbpath1/benchmark/servers.dat and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000000.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000000.sdb
deleted file mode 100644 (file)
index cc72f87..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000000.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000001.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000001.sdb
deleted file mode 100644 (file)
index 570d307..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000001.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000002.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000002.sdb
deleted file mode 100644 (file)
index 0bd7772..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000002.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000003.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000003.sdb
deleted file mode 100644 (file)
index 4c32ce6..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000003.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000004.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000004.sdb
deleted file mode 100644 (file)
index 9f82b6f..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000004.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000005.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000005.sdb
deleted file mode 100644 (file)
index 3147145..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000005.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000006.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000006.sdb
deleted file mode 100644 (file)
index 6e16076..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000006.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000007.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000007.sdb
deleted file mode 100644 (file)
index 28e0170..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000007.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000008.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000008.sdb
deleted file mode 100644 (file)
index d77d432..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000008.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000009.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000009.sdb
deleted file mode 100644 (file)
index b65dc65..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000009.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000010.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000010.sdb
deleted file mode 100644 (file)
index 5bf9df7..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000010.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000011.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000011.sdb
deleted file mode 100644 (file)
index 7e05338..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000011.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000012.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000012.sdb
deleted file mode 100644 (file)
index e3ece24..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000012.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000013.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000013.sdb
deleted file mode 100644 (file)
index 994b42e..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000013.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000014.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000014.sdb
deleted file mode 100644 (file)
index 29ede03..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000014.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000015.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000015.sdb
deleted file mode 100644 (file)
index fee28bf..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000015.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000016.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000016.sdb
deleted file mode 100644 (file)
index 98016cf..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000016.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000017.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000017.sdb
deleted file mode 100644 (file)
index d91ee14..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000017.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000018.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000018.sdb
deleted file mode 100644 (file)
index e0f8943..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000018.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000019.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000019.sdb
deleted file mode 100644 (file)
index 9a4a7e6..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000019.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000020.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000020.sdb
deleted file mode 100644 (file)
index ee308d6..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000020.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000021.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000021.sdb
deleted file mode 100644 (file)
index 7d02fad..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000021.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000022.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000022.sdb
deleted file mode 100644 (file)
index 00fa673..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000022.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000023.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000023.sdb
deleted file mode 100644 (file)
index 998a2c8..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000023.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000024.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000024.sdb
deleted file mode 100644 (file)
index d33904c..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000024.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000025.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000025.sdb
deleted file mode 100644 (file)
index d79f537..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000025.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000026.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000026.sdb
deleted file mode 100644 (file)
index 41de6b4..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000026.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000027.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000027.sdb
deleted file mode 100644 (file)
index 068fc89..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000027.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000028.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000028.sdb
deleted file mode 100644 (file)
index 049b662..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000028.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000029.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000029.sdb
deleted file mode 100644 (file)
index 3485be0..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000029.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000030.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000030.sdb
deleted file mode 100644 (file)
index ef50350..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000030.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000031.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000031.sdb
deleted file mode 100644 (file)
index bfc1658..0000000
Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000031.sdb and /dev/null differ
diff --git a/dbtest/dbpath1/benchmark/users.dat b/dbtest/dbpath1/benchmark/users.dat
deleted file mode 100644 (file)
index 7f06059..0000000
+++ /dev/null
@@ -1 +0,0 @@
\ 1ð\84iris¿ZkjWsLgK$1/L2Uzs0bnkc01bpT/0KOlPC5hTe1d.xb6COEOdQ2Uc1aRFE9HpxZLéÿ\ 3
\ No newline at end of file
diff --git a/dbtest/siridb-http.conf b/dbtest/siridb-http.conf
deleted file mode 100644 (file)
index a03dfbb..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-# SiriDB HTTP Configuration file
-[Database]
-# User with at least 'show' privileges.
-user = iris
-
-# A password is required. To protect the password this file should be placed in
-# a folder where unauthorized users have no access.
-password = siri
-
-# Database to connect to.
-dbname = benchmark
-
-# Multiple servers are allowed and should be comma separated. When a port
-# is not provided the default 9000 is used. IPv6 address are supported and
-# should be wrapped in square brackets [] in case an alternative port is
-# required. SiriDB HTTP will randomly select an available siridb server
-# for each request.
-#
-# Valid examples:
-#   siridb01.local,siridb02.local,siridb03.local,siridb04.local
-#   10.20.30.40
-#   [::1]:5050,[::1]:5051
-#   2001:0db8:85a3:0000:0000:8a2e:0370:7334
-servers = localhost:9001
-
-[Configuration]
-# Listening to TCP port.
-port = 5050
-
-# When disabled no authentication is required. When enabled session
-# authentication or basic authentication is required.
-require_authentication = True
-
-# When enabled /socket.io/ will be enabled and Socket-IO can be used as an
-# alternative to the standard http rest api.
-enable_socket_io = True
-
-# When enabled the crt_file and key_file must be configured and the server
-# will be hosted on https.
-enable_ssl = False
-
-# When enabled a website is hosted on the configured port. When disabled the
-# resource URIs like /query, /insert, /auth/.. etc. are still available.
-enable_web = True
-
-# When enabled the /query and /insert resource URIs can be used with basic
-# authentication.
-enable_basic_auth = False
-
-# When multi user is disabled, only the user/password combination provided in
-# this configuration file can be used.
-enable_multi_user = False
-
-# Cookie max age is used to set the cookie expiration time in seconds.
-cookie_max_age = 604800
-
-# The query api allows you to specify a timeout for each query, but the insert
-# api only accepts data. Therefore the insert timeout is set as a general
-# value and is applicable to each insert.
-insert_timeout = 60
-
-[SSL]
-# Self-signed certificates can be created with the following command:
-#
-#   openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
-#        -keyout certificate.key -out certificate.crt
-#
-crt_file = certificate.crt
-key_file = certificate.key
-
-#
-# Welcome and thank you for using SiriDB!
-#
-# A configuration file is required and shoud be provided with the
-#   --config <file> argument.
-# Above you find an example template which can be used.
-#
-
diff --git a/dbtest/siridb0.conf b/dbtest/siridb0.conf
deleted file mode 100644 (file)
index ead07f2..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-# Welcome to the SiriDB configuration file
-
-[siridb]
-#
-# SiriDB will use this address:port for it's back-end connections.
-# This must be an address that other servers can use to connect to.
-# For example IPv4, IPv6 or a fqdn are all possible. When using IPv6 be sure
-# to wrap the ip address with square brackets. For example [::1]:9010
-# The default value is %HOSTNAME:9010. The variable %HOSTNAME will be translate
-# to the systems host name.
-# 
-#
-server_name = %HOSTNAME:9011
-
-#
-# Listen for SiriDB-server connections only on localhost.
-# Use value 0.0.0.0 (or :: for IPv6) to bind to all interfaces.
-#
-bind_server_address = 0.0.0.0
-
-#
-# SiriDB will listen for client connections on this port number.
-#
-listen_client_port = 9001
-
-#
-# Listen for client connections only on localhost.
-# Use value 0.0.0.0 (or :: for IPv6) to bind to all interfaces.
-#
-bind_client_address = 0.0.0.0
-
-#
-# When ip_support is set to ALL, SiriDB will listen and connect to both IPv4
-# and IPv6 addresses.
-# Valid options are ALL, IPV4ONLY and IPV6ONLY.
-#
-ip_support = ALL
-
-#
-# SiriDB will load databases from, and create databases in this location.
-#
-default_db_path = ./dbpath0
-
-#
-# SiriDB will run an optimize task each X seconds. A value of 0 (zero) disables
-# optimizing.
-#
-optimize_interval = 3600
-
-#
-# SiriDB uses a heart-beat interval to keep connections with other servers
-# online.
-#
-heartbeat_interval = 30
-
-#
-# SiriDB can run fsync on the buffer file on an interval in milliseconds. 
-# This value is set to 0 by default which tells SiriDB to run fsync after 
-# each insert request. When having many insert requests per second, it can be 
-# useful to use an interval like 500 milliseconds.
-#
-#buffer_sync_interval = 500
-buffer_sync_interval = 500
-
-#
-# SiriDB will not open more shard files than max_open_files. Note that the
-# total number of open files can be sligtly higher since SiriDB also needs
-# a few other files to write to.
-#
-max_open_files = 32768
-
-#
-# Use shard compression for storing data points.
-# Set value 0 to disable shard compression.
-#
-enable_shard_compression = 1
-
-#
-# Enable named pipe support for client connections.
-#
-enable_pipe_support = 0
-
-#
-# SiriDB will bind the client named pipe in this location.
-#
-pipe_client_name = siridb_client.sock
diff --git a/dbtest/siridb1.conf b/dbtest/siridb1.conf
deleted file mode 100644 (file)
index 83bd178..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-# Welcome to the SiriDB configuration file
-
-[siridb]
-#
-# SiriDB will use this address:port for it's back-end connections.
-# This must be an address that other servers can use to connect to.
-# For example IPv4, IPv6 or a fqdn are all possible. When using IPv6 be sure
-# to wrap the ip address with square brackets. For example [::1]:9010
-# The default value is %HOSTNAME:9010. The variable %HOSTNAME will be translate
-# to the systems host name.
-#
-server_name = %HOSTNAME:9011
-
-#
-# Listen for SiriDB-server connections only on localhost.
-# Use value 0.0.0.0 (or :: for IPv6) to bind to all interfaces.
-#
-bind_server_address = 0.0.0.0
-
-#
-# SiriDB will listen for client connections on this port number.
-#
-listen_client_port = 9001
-
-#
-# Listen for client connections only on localhost.
-# Use value 0.0.0.0 (or :: for IPv6) to bind to all interfaces.
-#
-bind_client_address = 0.0.0.0
-
-#
-# When ip_support is set to ALL, SiriDB will listen and connect to both IPv4
-# and IPv6 addresses.
-# Valid options are ALL, IPV4ONLY and IPV6ONLY.
-#
-ip_support = ALL
-
-#
-# SiriDB will load databases from, and create databases in this location.
-#
-default_db_path = ./dbpath1
-
-#
-# SiriDB will run an optimize task each X seconds. A value of 0 (zero) disables
-# optimizing.
-#
-optimize_interval = 3600
-
-#
-# SiriDB uses a heart-beat interval to keep connections with other servers
-# online.
-#
-heartbeat_interval = 30
-
-#
-# SiriDB can run fsync on the buffer file on an interval in milliseconds. 
-# This value is set to 0 by default which tells SiriDB to run fsync after 
-# each insert request. When having many insert requests per second, it can be 
-# useful to use an interval like 500 milliseconds.
-#
-#buffer_sync_interval = 500
-buffer_sync_interval = 500
-
-#
-# SiriDB will not open more shard files than max_open_files. Note that the
-# total number of open files can be sligtly higher since SiriDB also needs
-# a few other files to write to.
-#
-max_open_files = 32768
-
-#
-# Use shard compression for storing data points.
-# Set value 0 to disable shard compression.
-#
-enable_shard_compression = 1
-
-#
-# Enable named pipe support for client connections.
-#
-enable_pipe_support = 0
-
-#
-# SiriDB will bind the client named pipe in this location.
-#
-pipe_client_name = siridb_client.sock